*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8cdc2bf41d9becdb6358c69a4b0cfc698d007594..efad56aa0fcc8563ea3f089fa56cde77aa1e4885 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2008-06-11  Michael Albinus  <michael.albinus@gmx.de>
+
+       * net/tramp.el (tramp-make-temp-file): Backport from Tramp 2.1.
+
 2008-06-08  Michael Albinus  <michael.albinus@gmx.de>
 
        * uniquify.el (uniquify-get-proposed-name): Handle remote files.